Fixing breakage caused in #10174#10340
Merged
ycombinator merged 2 commits intoelastic:6.xfrom Jan 25, 2019
ycombinator:backport_10135_6.x
Merged
Fixing breakage caused in #10174#10340ycombinator merged 2 commits intoelastic:6.xfrom ycombinator:backport_10135_6.x
ycombinator merged 2 commits intoelastic:6.xfrom
ycombinator:backport_10135_6.x
Conversation
ruflin
approved these changes
Jan 25, 2019
Contributor
ruflin
left a comment
ruflin
left a comment
There was a problem hiding this comment.
Glad you found this. Should have catched this in the review :-(
Contributor
Author
|
jenkins, test this |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
PR #10174 inadvertently broke the parsing of a couple of fields:
The audit event. The correct field for 6.x should've been
elasticsearch.audit.event_typebut Cherry-pick #10135 to 6.x: Elasticsearch/audit fileset should be more lenient in parsing node name #10174 was parsing this information intoevent.type. The latter is an ECS field that should only exist in 7.0+. This PR reverts the target field toelasticsearch.audit.event_type.The audit URI. PR Cherry-pick #10135 to 6.x: Elasticsearch/audit fileset should be more lenient in parsing node name #10174 introduced a typo in the grok expression for this field, thereby causing it and any subsequent fields in the log line to no longer be parsed. This PR fixes the typo and now the audit URI field and subsequent fields in log line get parsed again.